Move rendering mode into GdkDisplay

This is in preparation for making it runtime-settable in the
inspector.

diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c
index 7354a63c1795855b999918331b2c21737b433507..029a1c45fda41d4e4fa68986868fa54d4244bbb5 100644 (file)
--- a/gdk/gdkdisplay.c
+++ b/gdk/gdkdisplay.c
@@ -223,6 +223,8 @@ gdk_display_init (GdkDisplay *display)
 
   display->multiple_click_info = g_hash_table_new_full (NULL, NULL, NULL,
                                                         (GDestroyNotify) g_free);
+
+  display->rendering_mode = _gdk_rendering_mode;
 }
 
 static void

diff --git a/gdk/gdkdisplayprivate.h b/gdk/gdkdisplayprivate.h
index 4c6f4a015bcf037c21459e1d342bfba0f7993dea..2f026fe09c153806b390272dab02d7f9b19c781d 100644 (file)
--- a/gdk/gdkdisplayprivate.h
+++ b/gdk/gdkdisplayprivate.h
@@ -21,6 +21,7 @@
 #include "gdkdisplay.h"
 #include "gdkwindow.h"
 #include "gdkcursor.h"
+#include "gdkinternals.h"
 
 G_BEGIN_DECLS
 
@@ -119,6 +120,8 @@ struct _GdkDisplay
 
   guint has_gl_extension_texture_non_power_of_two : 1;
   guint has_gl_extension_texture_rectangle : 1;
+
+  GdkRenderingMode rendering_mode;
 };
 
 struct _GdkDisplayClass

diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index 7d85b76ef4c09826a9981697b923d1e06aac2f06..fdbdf37fb995eb3a35e3bace101933ee80da10f9 100644 (file)
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -9448,6 +9448,7 @@ gdk_window_create_similar_surface (GdkWindow *     window,
                                    int             width,
                                    int             height)
 {
+  GdkDisplay *display;
   cairo_surface_t *window_surface, *surface;
   double sx, sy;
 
@@ -9457,7 +9458,8 @@ gdk_window_create_similar_surface (GdkWindow *     window,
   sx = sy = 1;
   cairo_surface_get_device_scale (window_surface, &sx, &sy);
 
-  switch (_gdk_rendering_mode)
+  display = gdk_window_get_display (window);
+  switch (display->rendering_mode)
   {
     case GDK_RENDERING_MODE_RECORDING:
       {